scale: Fix value position

by not using the range's gadget which is not allocated to any position
anymore.

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 18fec6029813a3077959583e7b6c1dd978261798..b59171abbe7c1782341773f4277b7aa3a58eff06 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -3654,9 +3654,3 @@ gtk_range_get_slider_gadget (GtkRange *range)
 {
   return range->priv->slider_gadget;
 }
-
-GtkCssGadget *
-gtk_range_get_gadget (GtkRange *range)
-{
-  return range->priv->gadget;
-}

diff --git a/gtk/gtkrangeprivate.h b/gtk/gtkrangeprivate.h
index 98456a602fb3e8fe54bc7ed451e607b827c37a0e..a3d35b361fa7974396d3cd7d5d2de5d612901c0c 100644 (file)
--- a/gtk/gtkrangeprivate.h
+++ b/gtk/gtkrangeprivate.h
@@ -50,7 +50,6 @@ void               _gtk_range_set_steppers                 (GtkRange      *range
                                                             gboolean       has_d);
 
 GtkCssGadget      *gtk_range_get_slider_gadget             (GtkRange *range);
-GtkCssGadget      *gtk_range_get_gadget                    (GtkRange *range);
 
 G_END_DECLS
 

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index bde4a8bbb4093334d4fb114698f835115b5ef6e3..3849eac62fba3b023b638be251b2edbb7b483aa4 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -291,11 +291,10 @@ gtk_scale_allocate_value (GtkScale      *scale,
   GtkScalePrivate *priv = scale->priv;
   GtkWidget *widget = GTK_WIDGET (scale);
   GtkRange *range = GTK_RANGE (widget);
-  GtkCssGadget *range_gadget, *slider_gadget;
+  GtkCssGadget *slider_gadget;
   GtkAllocation range_alloc, slider_alloc, value_alloc;
 
-  range_gadget = gtk_range_get_gadget (range);
-  gtk_css_gadget_get_margin_allocation (range_gadget, &range_alloc, NULL);
+  gtk_widget_get_margin_allocation (widget, &range_alloc);
 
   slider_gadget = gtk_range_get_slider_gadget (range);
   gtk_css_gadget_get_border_allocation (slider_gadget, &slider_alloc, NULL);